Merge remote-tracking branch 'aosp' into rvc-dev am: 56aec3f177 am: 29db5d3712 am: 088cf5fd5f am: 64cfdc3c0b am: 40fc10bae8

Change-Id: I11bbb26ab39911d8bb8344993387815679d57910