Minor updates to Context & Device claims