Merge "Fix typo in AlertController.java"