Merge "Modify app so it will run in ICS MR1"