Merge "Fix broken test cases" into rvc-dev am: 15254e3b5e am: f96e7d7219 am: 283b1f248f am: dd73e7b1ba am: cf37b86adf
Change-Id: I540b4489f5f744ea1a38c9625023aace031b8631
This commit is contained in: