Merge "Key rotation support when updating an app on IncFS." into sc-dev