Fix build am: c5b95cd33a am: 4828c2cc73
am: 6f30a038db

Change-Id: Ib8420e606841663686d8bd23ea9ee947244a3476