Merge "Set sIsInitialized to false and add logging"
am: a0a70be251

Change-Id: I578a9f5690d2320116427025f831e11c9ffcdd7d