Merge "Fix drawable CTS breakages" into mnc-dev