Merge "Fix use of uninitialized value" am: bc75301408 am: b717e128c1
am: 86ebf00c8e

Change-Id: I9113f3b665c8e3b24ccd61c141a19e12c1ba3ce2