Fix the build am: 4707e2b64d am: f304453c99
am: d85854558a

Change-Id: I31fbf6b750e9239b3f07aa6877c3b66d2b714016