Merge "Add APIs to update and listen to deviceId changes in Context"