Merge "Fix setRippleColor on FloatingActionButton" into lmp-mr1-ub-dev