Fix build break. am: a156e670c4 am: ea34da7ca3
am: ef091708d6

* commit 'ef091708d6c86d8ee6125deb5d22e1213c804a72':
  Fix build break.

Change-Id: I0c29e7fb041d08d3d698df9b0b6ddd3f577a31a3