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

Change-Id: I7c53e859a19aaece1a7e5fb171bcf3e509370799