Merge "Fix uninitialized member variable"
am: 46bb1ffa8a

Change-Id: I102f6414d6846186327f68b5dae2e23eadfa0502