Fix easily misinterpreted context

Change-Id: Ied0e6abefe9956af8f3dd331be4dfc1d6d84e74b
Closes-Bug: 1343612
Merge "Fix easily misinterpreted context"