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

Change-Id: Ibc7e914383e125154d3d5b0bbf6dc585d2a650d9