Merge "Remove unneeded context" into pi-dev am: 72e895fd9f
am: a4d3ac7988

Change-Id: I8c5eabd47fc655b51854d7f05102c74a1b9bb081