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

Change-Id: Ide646190e22cdbc3fbea9a7fb6b813bd90bd6d40