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

Change-Id: Iad3c9b0538c8b1d0f5e7ce1bd04b066520ccbfcb