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

Change-Id: Ibba93af7944050399c668d7cde70846de562d552