Merge changes I22ff91e8,I6dcef977 into rvc-dev am: 52c8bac7d7 am: 38e10c823d

Change-Id: I4683ccd295bd22721400e2faa160da407e6a2ed7