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

Change-Id: I5a060283407a74bf9996ee242582b1b4b1d980f9