Merge "Retrieve phone object properly."
am: 1efb148f8d

Change-Id: I9dc76cde79a679214aef848d334ae55564443d04