Merge changes from topics "phone_cap", "tdscdma", "update-regstate-rplmn" am: 868156ace2 am: beded753de

Change-Id: I677faac38dc0c5b5436546fa8dff6c0d87cd49b2