Merge "Revert "Revert submission""
am: e8f4fb5db0

Change-Id: I67c9de553861cf37160d30a5f1196e83eee3778f