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

Change-Id: I1ed85fbd79742d896ada03e0a5966b2761f2d38b