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
am: 7c162fe449

Change-Id: Ibb89cd516155c8d8c3e6f8deceb068165e731362