Merge "Fix broken test cases" into rvc-dev am: 15254e3b5e
am: f96e7d7219
am: 283b1f248f
am: dd73e7b1ba
Change-Id: I4b8477e84e5259309eabcd218bfb62dc3fb24c53
This commit is contained in: