Merge "Fix fastlane shadow." into lmp-dev