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

Change-Id: I8f739962582292138791e25cfef0ce080f9b6e80