Fix context is not set correctly

Closes-Bug: #1406539
Change-Id: I4dac11e3f15ba51502c08b66299cc75f8fd45dec
Merge "Fix context is not set correctly"