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

Change-Id: Ibbc592cb5fc2b035b87cbb89dcf5dee085c63e14