Merge "Merge anti aliasing patch" into lmp-mr1-ub-dev