ensure ::keyholder is applied before ::keyholder::monitoring

Change-Id: I59289f9f7d97ee82f21c846f60b96064bf32630c