Revert "Revert submission"
am: 318303ce0e

Change-Id: Ic020b38abe6b537adf17842b9c46db3da45ab4ec