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