[automerger skipped] Merge "Zero hidl-generated structs" into oc-dr1-dev am: c62f78a630 -s ours
am: 205dd6ed92 -s ours
am skip reason: change_id I8fb10532b6fdf9afa419f19fc634981e7cbd3c10 with SHA1 da1d449882 is in history

Change-Id: I7ad06c8e0212e5fbb5b56ea2c707552a1a7b4771