Merge "fix  warning: struct argument contains uninitialized data"
am: 4ad8990c14

Change-Id: If332f7d2f5be4180f4cf32f92ae86d62711f3b9b