Merge "Remove ityaptin key"