Merge "Reset app reporting on app launch." am: ccaea274c0 am: 3be71b9df6
am: 7cf4b95c22

Change-Id: I44853dba5d86e799a7b40fdf14d70f8f8b96aaaf