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

Change-Id: Ie31648ef065783dcf02e0a1c36e16b54d1c17c17