Merge branch 'stable-3.3' * stable-3.3: Make GlobalHealthCheck reentrant Change-Id: I5d09b238578af5d89beb5e5c25b6c26a43955e3a