Merge "Add -z option to bugreport service" am: f5fa715652 am: e8ebf08036
am: c2c3532177

Change-Id: Idff960c64e32c51fd313685d7ff6eb1bba6c62bf