Merge "Fix broken test cases" into rvc-dev am: defd64c797
am: f6d924b9dd
am: 1ad4898230
Change-Id: I2caca1f63c41868364bd7cd8f004d8a74260df03
This commit is contained in:
defd64c797
am: f6d924b9dd
am: 1ad4898230
Change-Id: I2caca1f63c41868364bd7cd8f004d8a74260df03