Update app context in code snippet bug: 28842396 am: 056df25179 am: 0fc19538cf
am: cca8eba82d

* commit 'cca8eba82d48888656d36aed8020fd3ecd738fdd':
  Update app context in code snippet bug: 28842396

Change-Id: I04ef5aeac32a526028e71ed71bcdf39920cc0c4f