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

Change-Id: Ieab310032dbf29bab829c7b01225d84fd3df354c