Fix build am: aaef0983ba am: 5a556bc71e
am: 025d6efd95

Change-Id: I523da99a804e27c6ab4a35aecfb3c3a820ebd45d