[automerger skipped] Merge "Migrate StatsHal" am: e566dd697b am: 96e90c3ae6 am: 99ee66f7fc -s ours
am skip reason: Change-Id I19ff6edf78bd84a95d8c0ae3a1adda99d4232aa5 with SHA-1 0e0313c399 is in history

Change-Id: I5036ab044082cf7a4ca7f0fd83f31c93648f9445