Fix build am: d664aff769
am: 0120426fad

* commit '0120426fad7b27b30a0091c44b0c28bb96711473':
  Fix build

Change-Id: Ib7ec0efe47011b4d0ab2df590d1fda434fc9e728