Merge "Fix parcelling issue for certain fields." into qt-dev am: 1f0eec4faf am: 96f3bfa20b
am: d43beff315

Change-Id: I3358bf770275cf74db443954031af8eaef8a7a47