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

Change-Id: Iea1a397f79856070d5f801193c71721a8ff69936