Merge "Remove unnecessary disk access when loading synthetic password states" into pi-dev
am: ece60739aa

Change-Id: Ic443dc0cb20282a89a274835375037689ab6d8f4