Merge mnc-dev-plus-aosp into mnc-dev

Change-Id: I2134cab4087ee6ae660e630e628b8957898f907a