Merge "Merge changes from topic "sf_157096772" into rvc-dev am: b74fe1dc23 am: 3c6363492d am: d3f2d5876f" into rvc-qpr-dev-plus-aosp am: 5a0dfa80c5

Change-Id: Ica66df6e8a173e749a1eb302d160619086a8f5f8