Merge "Set system property for FULL bugreport instead of default." am: e3a133095e
am: 0c8165fccf

Change-Id: I2f9e2b89c0976eccb82f99e8248aa614fc55e86c