Merge "Fallback to ML prediction after short ACTIVE states" into pi-dev
am: 50c069e489

Change-Id: Idd2b0abba22ec10e263fe3ab49ecc7346b9bc941