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