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