Merge "Make SecureElement service bootaware"