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

Change-Id: Ia7a0d46b0a4cb0c1d39b6c9ec9f0e06c733b009b