Fix build break. am: a156e670c4 am: 0759ea2785
am: 2b2862a0d6

* commit '2b2862a0d6617beb6b1c4d3fd439221ae1e0d0e9':

Change-Id: I937a9a0b8269adbe42e31822ad28c3bdd5ef7d93