Merge changes I80f66d19,I68810035 into rvc-dev am: 8d974dc239 am: 0e2a7a1cf7

Change-Id: I61566e6b85c30144b378a585af148de7b31afabf