(cherry-pick of 06c3ef1367e850746eef0a5462bdce8674d74c30) Bug: 21414325 Change-Id: I08118be8e8cf92fc406d431e99a6c9191a863ff3