Merge "Resolve difference between master and rvc-dev." into rvc-dev am: dea08002fa am: c5485f4025 am: a585e4070f
Change-Id: Ib3122a0a91f459854bb3cecf899ca8d91b6add7b
This commit is contained in: