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

Change-Id: I3986f14b0e6e7e9774e8cc2f1cb34829e77a25c1