Merge changes from topic "StatsEvent JNI"
am: 0a31673879

Change-Id: I0525a19b92ab2e7d6900d9e8a07f1f02b28c6336