Merge "Merge "Apply tint when setting check mark drawable" into nyc-dev am: fff349d am: fe1776a" into nyc-mr1-dev-plus-aosp