Merge changes from topics "141018421_set3", "146905502", "remove_getPhoneId" am: 939d3d62 am: 69804fac Change-Id: I024e8d46492c7a40a30cd6aa036df2ddee1623ce