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

Change-Id: I94a9902e5ad2af84814b5f03365f90417223c508