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