Merge changes I10355143,I85adb8c3 into rvc-dev am: 1d68911a9d am: 8a29ec806a am: 5fcbbd2fdc am: 83327627f3
Change-Id: I02b03f5e9607b44da5908da41aa267e03310f6b2
This commit is contained in: