Fix build. am: 8a0490365d am: 4f24df9831
am: df3be61e82

Change-Id: I1f6bd1a03f7af34bd50a7512072957134dbb4d3f