Merge changes from topic "code_sync_from_aosp" into rvc-dev am: 24466c49 am: a194a42d am: 7ab065e2 Change-Id: I9363cc26b19b7bc4fe4b9659ee86d0023702d314