Merge remote-tracking branch 'aosp' into rvc-dev am: 56aec3f177 am: 29db5d3712 am: 072796a95b am: e84603a3a9

Change-Id: Icee55d9166ad91c8c22da740a857cfe4dca81001