Merge "Merge changes I28153a56,I620224b9 into rvc-dev am: 56ea9e94 am: 349b058b" into rvc-d1-dev-plus-aosp am: c2905451 Change-Id: I3e31441660645268d13f75d92389f5785fb4b824