Merge "Breaks the build. Issue being tracked in b/15538481" into lmp-preview-dev