Merge "Require strong auth after user is stopped" into pi-dev am: 7109908a4e
am: 33a0fe9daa

Change-Id: I3f819788b02f80caf55df46bdaf19bcf00f34121