Merge "Fix broken test cases" into rvc-dev am: defd64c797
am: f6d924b9dd
am: 1031ccd943
am: e338d997a7
Change-Id: I6edcfcbb434e83a7c4dd09809534a787ac58fb84
This commit is contained in: