Fix build am: d664aff769 am: b7f49d9270
am: f8f30ec91e

* commit 'f8f30ec91ecd7e7d69cd2e13db0a373cc079cffe':

Change-Id: I09d884c0772279f3fc76b3cf1dff76d698bf09bd