Merge changes I7c542db9,I6f809ce2 into rvc-dev am: dc1fe78978 am: 55391e9b1e

Change-Id: I0e67f76c6eeb607a37ecada9900c8578c32276da