This reverts commit 6d1ea2bb16. Reason for revert: Re-landing changes not related to postsubmit failure Change-Id: If7940801518be5ddec91270b3663ddfc8b42eadb
6d1ea2bb16