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

Change-Id: I27bd49ef3fa2c65a1e638069807a8a4f03d6b418