Merge "Ensure GetPhase returns correct values." am: 04ae110f02 am: 994cfdee26
am: 10709413bc

Change-Id: Ie4f2ec0859a1d16267c3f46dc02d2946b6284eb7