Merge "Fix parcelling issue for certain fields."
am: 541f01b1bc

Change-Id: I2c89c2df5672ed401576db09fd6d4c5d0f430645