Fix GetBoundaryValues.

Change-Id: I8f8bbdb88e9b24e4c37ff869126ed9343f261ce2