Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b764 -s ours am: ded4df2e am: 462493ee am: 585f642d -s ours am: 2cd4383c Change-Id: I0e6d2e4c60383c95a4a73bccfdb12472152e86a0