Bug: 22460275 Change-Id: Ib27456d12c9284edfdc27d010782840765728853 (cherry picked from commit 0f939fec)