Reconcile with CM mr1.1-staging

Change-Id: I30f4c9f4714db4446ec7f1b4e8dfa43d3ea9c90e