Merge changes I9ea20221,I81b7546c into rvc-dev am: 0f1eb7d451

Change-Id: I770e124b82e833a3b661fca0486aa4bc02feb1bb