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

Change-Id: Ifff6d16996e109958f22414ccc451334339d2925