Should be merged along with Ie566f9b0b6ba267470c01f17c3f4ea74482e2d2d Bug: T189982 Change-Id: Id3d44fe0e7884276f7c81253f6b765984f5c9945