[automerger skipped] Zero hidl-generated structs am: da1d449882 -s ours
am: bbffb020ad -s ours
am skip reason: change_id I8fb10532b6fdf9afa419f19fc634981e7cbd3c10 with SHA1 523b12cce1 is in history

Change-Id: Ic27982f93ac9d9f15b31fe6cc5fc9d89fd9f00b3