Merge branch 'stable-3.2' into stable-3.3 * stable-3.2: Make GlobalHealthCheck reentrant Change-Id: Idbb21bc86bf2e0bfc021f80f1a77a4c43b512409