Merge remote-tracking branch 'aosp' into rvc-dev am: 56aec3f177 am: 639844e661

Change-Id: I778964d18564a3fec78dfe37196829c872524b49