Revert "Revert submission"

This reverts commit a09086b9af376e65bea841b0c9df6f6e56c923fd.

Reason for revert: Fixing breakage that required the revert

Change-Id: I0de6e3690fdc8774bf089baca539bfdd41a7ded2
1 file changed