Merge changes I977507a8,I3f2670c7 into rvc-dev am: b6ddea2951 am: 32703e1b90

Change-Id: I04595ecced524f41b9a4636a928c25ab444be26a