(cherry-pick of 06c3ef1367) Bug: 21414325 Change-Id: I08118be8e8cf92fc406d431e99a6c9191a863ff3
06c3ef1367
9edd6be542
e5852eb501