Merge "Updates to support FEATURE_WATCH devices"