Merge changes from topics "lpdump-all", "lpdump-bugreport"
am: 2cf1c60a8c

Change-Id: I96ddbe6cf8a067230f638f8db2c89e6647795272