Merge "Fix the unintialized value reported by msan" am: 3153f95a45
am: 6dd761313e

Change-Id: I5abf7371c65712410862b2fe3adf977b567fbb4d