Merge "Fix DrawableCompatTest" into mnc-ub-dev