Merge "Set mContext scope to protected." into nyc-mr1-dev