Fix build am: aaef0983ba
am: 2c410e0d5f

Change-Id: I59bd691307c3c91da1a3b62ba9c83641f356c84b