Merge "PhoneCapability cleanup"
am: b922a13760

Change-Id: I8c102995c2223e744805ab7e4696013b675acb94