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