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

Change-Id: I4b5c9e1cca7641b786e118ff979b33b25394fa3e