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

Change-Id: I5e6a69fb50c9820f8b0a7e834608a32f651a860a