fixed number of issues in section_telemetry-data-collection

changed architectural and Telemetry in 4 places with other changes as well
Partial-Bug: #1394860

Change-Id: I309bae61d9c01fc6439060a29e715077fa53f7f2
Merge "fixed number of issues in section_telemetry-data-collection"