Merge "Eliminate cmhandle-properties tag"