add global double check
bug:23213925

Cherry pick from de27bba40755ad7b516faa475f31ca76e80f4862

Change-Id: I918fb4ae81252a16c33b0d3756803d7132213fc1
2 files changed