Merge changes from topic "code_sync_from_aosp" into rvc-dev am: 24466c4924

Change-Id: Iedf5e987cc001b5e7fa5aca31a053be501ec08fa