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

Change-Id: I23720c8a6f577da910a45bbbc4373f1ad9256ce8