DO NOT MERGE - Fix build am: bf835e4525 am: 98b31b9270
am: 1038762b09  -s ours

Change-Id: I43d1bdb6bd3f432b44513687d1736fc344c68f9a