Fix the build am: 4707e2b64d
am: f304453c99

Change-Id: I171b96c4a194c6dd7ad8ff729dd5619bef112a95