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

Change-Id: Iaa8594d8fdce768104e77d2df8aa5a0728bb767a