Merge "Fix RippleDrawable alpha" into udc-dev