Revert "Revert "Merge to upstream r304942.""
am: c79549b70e

Change-Id: I494187a52b9f72b7893afff4cd60cf021c4da31a