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

Change-Id: I674d84447e613a73508f610818c0506af0121608