am 0f84781b: (-s ours) am 54c807e7: Merge "Translate ripple mask to account for drawable bounds" into mnc-dev

* commit '0f84781bbab1c2f2d982b962507898f8351ed6fd':