Merge "Merge "Fix parcelling issue for certain fields." into qt-dev am: 1f0eec4faf am: 362d320315" into qt-r1-dev-plus-aosp
am: b0b3ce4f24

Change-Id: Iab7ebd5229950ca13f4059c3fccaeccaf0033a3a