Merge changes I977507a8,I3f2670c7 into rvc-dev am: b6ddea2951 am: 9f8a432b15 am: 14e67342a6

Change-Id: I1269da2941c16c7c4606b85202da094a5e99b796