am 84e518eb: am f9b799b5: cherrypick from ics Change-Id: I07b59de3f2e4a5fef2e8722d7f7ab159ded8b2df return old analytics script

* commit '84e518ebcd0e9edd4b27ea5f7be181d4532e88b5':
  cherrypick from ics Change-Id: I07b59de3f2e4a5fef2e8722d7f7ab159ded8b2df return old analytics script