DO NOT MERGE - Fix build am: bf835e4525 am: 98b31b9270 am: 1038762b09  -s ours am: 5d925fce78  -s ours am: 0576ffb637
am: cd349da1c2

Change-Id: I0bbf7d30e9f37cf6cb3f2a73d790b079c0bf837b