Revert submission
am: a0b4631f73

Change-Id: I7aeecfb8bb73fa3ee026ea1e47e81a9159f14b8d