Merge "Fix handling of load bias values."
am: 9c1d75983a

Change-Id: I6cde23f871fa5e36b0b9333f5fba8bd86dc56f48