Merge "Fix broken test cases" into rvc-dev am: 15254e3b5e am: 13f57006fd am: af0aff058f am: c29bee67e9 am: b6dce94019
Change-Id: Id150158b4d42e91bd10207bb1081071be1df13c9
This commit is contained in: