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

Change-Id: Ib1d3ba042fba799f9061b74c0f78d77e830be1fd