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

Change-Id: I2a33ad0931c5beb4460cb19c8feb22c765cba407