Merge "Remove Context requirement from updatable" into pi-dev