Merge \\"Set mContext scope to protected.\\" into nyc-mr1-dev am: 8709d0fce8
am: e4747b39f0

Change-Id: If9d00d81152583305c6d526bf5c9e72281edc19c