Merge "[SP17] Wait for stats providers to report stats update" am: 1e47a3e71d am: 9262c04be3 am: be15d2d70f

Change-Id: I719a1b2c75123f6fa6c765eeced055720c052c9b