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

Change-Id: I377a996a5d94be3aa20729d78d40d442ff6d61df