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

Change-Id: I45c25c7966cc3a83d73a40b4073566ba47cf0888