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

Change-Id: I0e6d2e4c60383c95a4a73bccfdb12472152e86a0