Merge "Fix missing load bias." am: 3f407fcc37
am: 186b6bbdd5

Change-Id: I7c2ccd4d5ac96b2f7ae889ed0ffab6ed7327ade0