Merge "Fix a use-of-uninitialized-value warning" am: 53873df5fe
am: aea873ade0

Change-Id: I747d94158c8a1c77f8ae1076c93a3d22f6c22ef5