Modify app so it will run in ICS MR1

Change-Id: I56e516f87269bf973e256b156a20ec5b06809289
12 files changed