[automerger skipped] Merge "Fix parcelling issue for certain fields." am: 541f01b1bc
am: 07eec6e05d -s ours
am skip reason: change_id I5ab4f5f3fa05ffe837f1a5b5bccfb93df4902574 with SHA1 362d320315 is in history

Change-Id: I1be0d4b86e7f911affd3031363daeb0d10ab8aa2