Merge "Revert "Always project ripples"" into lmp-mr1-dev