Fix build am: 6f85d83163 am: cea6041539
am: ac11d74c81

Change-Id: I1ad4e94e71f9a1c50a0a46175cd126d52f28c2e7