These changes were missed by Sysadmin's proposed Migration Patch, this patch takes care of these missings. Related-Bug: #1825732 Change-Id: I5bf3367ef6800236c59cf35bd4388cc78d94f06a