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

Change-Id: I1386435d0e51e5c8381794d3e7fd325e69c042f0