Revert "Merge to upstream r304942." am: 38a0d5af7e am: 15b9926776
am: 7f84e28f80

Change-Id: I8f9fdef6d15c5a73ad5ae4edea462c9dd1014a3a