Merge "Revert submission" am: 0c3329b0dd am: b32ceec7aa am: 0cc00548ae

Change-Id: I65e389fbf10b40f4a1fa585ef37967da61488514