Merge "Return null value if getActiveAdminUncheckedLocked returns null." into nyc-dev