Merge "Work around b/70221552" am: f06d3a9857
am: b2432b2ab3

Change-Id: I07faa9adfd5e6589b9989be6056d994c5909408a