bring inline with CM and some of Omni's stuff

Change-Id: Ieca67da3ec031eaed4f059fe8b4483d9a88cfe1e