Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev am: 6fcac1d389
am: 4667f60fd6
am: c7081bedd5
Change-Id: I7e8ea3d01c7eeddc8fcb549044bab2f98990e83e
This commit is contained in: