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

Change-Id: Ieea49d886afaad9b56842781483182fb93b1e772