Merge changes I7fd7d98a,If770a615 into rvc-dev am: 266fba1670 am: e214f93de4

Change-Id: I665cf5d9d0b5f5a8424e7a36cbad7048a02f3786