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

Change-Id: I66386eb1d6a1d7e2476fc165513267a146a927f7