Merge "Resolve difference between master and rvc-dev." into rvc-dev am: dea08002fa am: b7b93fbec5 am: 41ce13e921 am: b08eeccb1e
Change-Id: I77a4fda8460d2213a88a18b27a59b99e5b6af1fc
This commit is contained in: