Merge "Adding KEY_PERMANENTLY_INVALIDATED int"