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

Change-Id: I53e3f05bbd2ac91556eb2db74da5d41ca4d61c2f