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

Change-Id: I006f513114a7e96232a92bf072f6ceb948b0510e