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

Change-Id: I234c13cef94edb62c6b7707a4a4d9a5282c3f00a