Fix build am: d664aff769
am: b7f49d9270

* commit 'b7f49d9270a54f4e1f9001b72a7f971adc6755be':

Change-Id: I291711366f2c4a968e0d380540dc0a05af1a3ddf