Merge "Use mContext directly, and enforce via logging"