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

Change-Id: Id9b31425cb8ba05687ff7dfa392b230865ec18e5