Merge "Revert "Work around b/70221552"" am: 79995a5673
am: b2f181d3c3

Change-Id: I7c6b318fe5393c0f14e9abae56fcfcaf3cb1c154