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

Change-Id: Ib4879f8dd3f2b893f5b6b8b7f69b69d9f868186a