Merge "AlertDialog Demo" into lmp-mr1-ub-dev