Merge "Fix uninitialized member variable"