Fix build am: d664aff769 am: 0120426fad
am: 83150d1411  -s ours

* commit '83150d141135e332163bc9aa0b4c6461d3c5e321':
  Fix build

Change-Id: I5dd6af16779090904df933d18eaa604d18643220