Merge "support parent carrier id"
am: 00496a1181

Change-Id: Ifdb44efdfbeecd6db8841c6de3f38e40a7e9566b