Added context for application

Change-Id: I328c1dddf7eeb2ed557df2ddce6386e0fa5c419e
Merge "Added context for application"