fix build am: 69bc432bac
am: 495d02fdd6

Change-Id: I28ace7d71ab33c722ce6a0410134267272128008