Merge "Update for PropertyWatcher API change."