Add the global correctly

Change-Id: I03be0cf1e82fc9f8f00727bed5aca9d9d2758c2e
Merge "Add the global correctly"