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

Change-Id: I8e886b2ef0442fe30c78f187348b40ffbaa6c4d4