Revert "Revert submission"

This reverts commit 536461d67aca916c93c55da989f33a5e590aec9c.

Reason for revert: Fixing breakage that required the revert

Change-Id: If833bd484c5f32397d833e684885386baf93b57c
6 files changed