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