Merge "PhoneCapability cleanup" am: b922a13760 am: b2cf59c78c

Change-Id: Ibcd39a40b4cd33804112783ecedaf248562f7942