Merge changes from topic "sp20-stats-provider-permission" am: 0fa3b9e2 am: 344ecb42 am: f500cec9 am: 19e7e80b Change-Id: I6ddaa4af861c49d2c1aacf7a87d6571e57f7a9e0