Merge "Fix broken test cases" into rvc-dev am: 15254e3b5e am: 13f57006fd am: af0aff058f am: c29bee67e9 am: b6dce94019 am: d9c77d8f85
Change-Id: I378f98373a56cc1791eb165e5fb47cf82802bdc0
This commit is contained in: