[automerger skipped] Merge changes from topic "StatsEvent JNI" am: 0a31673879 am: 1b7d460990 am: b9c68065e6 -s ours
am skip reason: Change-Id Ife976bb383ecff8de5064730692a95e2a3a82c9d with SHA-1 f104eb94be is in history

Change-Id: I65ef9d8ee88fe3e1af1b4edc466c9d9d3b287f47