Merge \\"Add support for Telecom analytics extensions\\" into nyc-mr1-dev am: 81ce5bc113
am: 31d9aa4f28

Change-Id: Ib19ee7012889b316dc7b9ad73db365c22e2217a1