[automerger skipped] Merge changes from topics "141018421_set3", "remove_getPhoneId" am: 01d55c5613 am: 6b25e76a23 am: f4ec346f00 -s ours
am skip reason: Change-Id If7a615f4d0117b7f12829fd87c48882360a34c52 with SHA-1 bdf60112a1 is in history

Change-Id: I2948b63a2ce37256f48a56f499e3195711edc339