Merge changes from topics "phone_cap", "tdscdma" am: b739deddc6 am: effc79cd29

Change-Id: Ifcdbefe72b514c58280854b29f7e8ece668e53e9