[automerger skipped] Zero hidl-generated structs am: c8b4c6d9dd -s ours am: fb91f3d40e -s ours am: bcea7cab61 -s ours
am: ebb4ac1422 -s ours
am skip reason: change_id I8fb10532b6fdf9afa419f19fc634981e7cbd3c10 with SHA1 da1d449882 is in history

Change-Id: I2823a5bdbad7b9f14c3a9014a6c7d272f58f6728