Merge "Fix uninitialized member variable" am: 46bb1ffa8a am: 9cf71d784e am: c134530c37
am: 1033781b10

Change-Id: Ibd9b0fa078a39868049c401e400fe94ef9ef690d