Merge "Merge "Add transfer mode support to ColorDrawable" into oc-dev am: eedceb5721 am: a17c58ff59"