Build fix.
am: f03bd4f547

Change-Id: Ic6ef93241a89d60d51288c34310abd0e31c3afdc