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