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

Change-Id: I26f9b4dfbfd57e6b17dd6bf1b4a8759af8d54483