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

Change-Id: Ie8c4b4df445063c09bfaf9a1e987798c6d1df978