Merge "Revert "Revert submission"" am: e8f4fb5db0 am: 78b70961cd

Change-Id: I9ca444d5df83ecac0d7640771d4add74ccc74f66