Merge "Reset short term model on user switch." into pi-dev am: 550972cb27
am: 194cf75171

Change-Id: I439ca5c406a773428250872eb9616f2808d0779e