Merge "Remove unnecessary Context from ApiLoader" into pi-dev