Fix build am: 581669db59 am: 2eaea8d703 am: 68cf833908
am: feff90bd79

Change-Id: I861fdf8b910809084d8d65845914fa3c40a35823