Return: Custom Carrier Label [2/2]

Change-Id: I1965fe6fd6cef7eb0fb78d856db9edf69659573d
Merge "Return: Custom Carrier Label [2/2]" into kk4.4