Merge "Fix use of uninitialized value"
am: bc75301408

Change-Id: Ia7ac71dda24dfa89f3c83774dc84085de28f738a