Merge "Fix broken test" into rvc-dev am: 5a950b763f
am: e8884576f7
am: 6e72355438
am: f33624e7a5
Change-Id: Ia64c5fedc0be3572224413c1050ea4c3e40c9c8d
This commit is contained in: