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