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

Change-Id: I4623c8255c715ff646b8392d69a725b720177f34