Merge "Revert submission" am: 9eca80bd16 am: 28a74dca87

Change-Id: I9bff97633d1756cd2875cfd3c9038842adbd7397