[automerger skipped] Merge changes from topics "phone_cap", "tdscdma" am: b739deddc6 am: effc79cd29 am: 7d9c74f0c2 -s ours
am skip reason: Change-Id I3349c3e50a806fb7bfd65b1bf16079878a5aeb06 with SHA-1 b1264fe56b is in history

Change-Id: I8855c0a1ba75055a7e50ae986a7756a60daed519