Merge "Fix broken test" into rvc-dev am: 5a950b763f am: e8884576f7 am: cfedf81a20 am: 377fce3022
Change-Id: Ie120ea232c7d001600b01afef637a8757949a03a
This commit is contained in: