Merge branch 'stable-2.15' * stable-2.15: Allow analytics to aggregate by branch Change-Id: Icac860297cb3c3e534f1f48a4fa76a876d87e751