This reverts commit ecf826a2ee. Reason for revert: need to edit the patch and then it will be GTG in order to finish hard deprecating of User ::getCanonicalName, ::isUsableName, ::isCreatableName Change-Id: I2f57f56728fcbeada96dc2228f07dc8bcaa5d4f6
ecf826a2ee