Merge changes Iad76baea,I3db5f4ff into rvc-dev am: 6fe5fd6e am: e440df36 am: 6604c036 am: a5b148b9 Change-Id: I0613879248c753dd1af216ed6b9d605dfc3da29d