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

Change-Id: I12622f707bd9ce55617b479ff67d398a888c01c0