[automerger skipped] Amend SMS over IMS proto and metrics collection am: 1be3fdb7 -s ours
am: 88d1189d -s ours
am skip reason: change_id I963bb31d12ea02fdaf36a6aa693f8956a0fb1580 with SHA1 ed7203c1 is in history
Change-Id: Icff7e32badf54c29580e0e381ede63fb1fefa3fc