Back to master we go -- few things broke synced with CM

Revert "Full reconcile with CM"

This reverts commit 85c7bd8d5e1eeb6658c13fa0dce25f9cbf0b615c.

Change-Id: I1a4e2922e625cdeb949d922372c7910121605357