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