Merge "Remove auto-boxing during the inflate" into mnc-ub-dev