Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452  -s ours
am: ded4df2e79

Change-Id: I16dd5912ae18ae4f25bdd9a8e2fa7d07ca8f1b61