Merge "change /data/bugreports to /bugreports" am: 1b2e6abf3b
am: 5fae86b5fa

Change-Id: I2df004fd046f3bae8732d0cba128e19c64814db4