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

Change-Id: Ib7644e66e1860a13c0e79b5976d9159ff2de43d2