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

Change-Id: I66c5c168c825cf69f57edd71a622aa7d7f980000