Merge "Ensure GetPhase returns correct values."
am: 04ae110f02

Change-Id: I308b049a18e5cbe1dc6a49e5cd789d4768933200