Fix build am: c5b95cd33a
am: 4828c2cc73

Change-Id: Ia0a2d000a864970a58dc5d39914f665e2c6baa9e