Revert "Merge to upstream r304942."
am: 38a0d5af7e

Change-Id: I5c295fe02de564551902d62e685f6b5d09d2bde2