Merge "Work around b/70221552"
am: f06d3a9857

Change-Id: Iffc61f54cb3d8354911c29fd3c8fbf1c08229166