Merge "Delete expired CE APEX snapshots when user unlocks." into rvc-dev am: a6eb7fa2 am: 145b90ca Change-Id: I98994bc15e1faf85a3d58dfa466ce641f9a4121d