Merge "Fix broken test cases" into rvc-dev am: 15254e3b5e
am: f96e7d7219
Change-Id: I5689c7b3750db96236c1f9a6e1f17da82d2eb23c
This commit is contained in:
15254e3b5e
am: f96e7d7219
Change-Id: I5689c7b3750db96236c1f9a6e1f17da82d2eb23c