Merge "Add AppCompat AlertDialog" into lmp-mr1-ub-dev