Revert "Revert "Merge to upstream r304942."" am: c79549b70e am: a6ad534de1
am: 17d978b88f

Change-Id: I877fda1d6dfe62db196d3bb29030949c27a2b5a3