Merge "Set initial KSV state after inflation" into pi-dev
am: 9d80381ad8

Change-Id: I088426dfa969de4d7a9257fa1d5e7731b7ded2b0