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

Change-Id: I999d8976d94d76fe58fd7059d42e5fe0c2280479