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

Change-Id: I508cc97fa41029d1485c89792ea560a23749979d