Merge "Fixed a bug where the colorization was lost when reinflating" into oc-mr1-dev
am: 0e261a68d2

Change-Id: Ia87d5fce1444602f9d65e3f1c8ace960d25e8d01