The key, value pair returned by items() wasn't used here, so rewrite the logic to just iterate over the keys, filtered by the type. Change-Id: I7512ea93ac794d161a4cd9944546d6ca035a12cf