Merge changes from topic "parcel-allocation" am: 3769b77023 am: bc53ad2700 am: 172cff5509

Change-Id: I6287e7a9b15e026ad44659e6a2e5ea9080d53f25