Merge "Merge "Make default brightness ramp rates multiples of 60." into oc-mr1-dev am: 9010bfb0 am: 23c0298b"