Misc changes

Change-Id: I5705562f46949473a5bdf19496b2e1fd6719cf8a