[automerger skipped] Zero-initialize hidl_vec data am: 6e8d69c766 am: 2f6751627d -s ours am: a6c2d037cf -s ours am: 8cb4782f80 -s ours am: 36d110f68b -s ours
am: 6326bf4a1a -s ours
am skip reason: change_id Ica6c55e7346b9e1ba91192472e2b229cb786802c with SHA1 7a3202296f is in history

Change-Id: I6ffb32966db42605d51479e702ebb9172ce3d59c