resolve merge conflicts of cae2ee036040fc0dce9fc82af9bf8d85240d566b to rvc-dev

Change-Id: I906ae5bed4b340817a52f7968276dea035f2e65a
Fixes: 169256435
Merged-In: I4d87e90793a88a646aaa1ae5806f118f1ae51e30
(cherry picked from commit 60f3ab275ef3ddf3afcdfdce4eb09b59024fec51)
1 file changed