Merge "Migrate StatsHal" am: e566dd697b am: 96e90c3ae6

Change-Id: I79fd074575472c7d92dff0a264bbbeae804655be