Clean up initialization checks for entrypoints.
am: 5115a4dffb

Change-Id: Ia126c093602e5b02dffddcc44db0eb796253667c