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

Change-Id: I8a16a1f1ce156c12639e7d53bc4bd1f9aa9af63d