[automerger skipped] Move sensitive field parceling bool to constructor am:...
[automerger skipped] Move sensitive field parceling bool to constructor am: 0acf9103 am: 50eadafe -s ours
am skip reason: Change-Id Ib145ca7f36dcbee6ef47d09862a181fc04a28f03 with SHA-1 ad7ddfd7 is in history
Change-Id: Ic7ac228a06137cce7338d06faceafe47e3475c3c