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