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

Change-Id: I7f98d1d33a53c4cdd0722fabe1866d1502551b56