Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 am: 7d7ddddcda am: cec1f09aaa am: ed46a7d526
Change-Id: I4fb6c1645553dc5fa17becebf219f2e6553ce128
This commit is contained in: