Merge changes I60bc5899,I97696070 into rvc-dev am: ed1adb192f

Change-Id: I937d1278e18118e953a35df5fc7fe54c0ea16dd9