Merge changes from topics "141018421_set3", "146905502", "remove_getPhoneId"
am: 939d3d62cd

Change-Id: Ib7278432e8564c0123c64cdc4934f280e528e687