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

Change-Id: Id480c199cc9b58c1dc48ac56f3cc5ac2ebe6107b