Merge "Include telemetry in packaging" am: f352ddd9ba  -s ours
am: 6bbe1323ab

Change-Id: Ibeb6a5f3ed47305b3385b1d5c44f4c4333307b92