Add s6 and s7 to user-metrics api.

Change-Id: I2c31bcf5456fc60173cae9a8384e0862ea928666
Merge "Add s6 and s7 to user-metrics api." into production