[automerger skipped] Merge "Use mContext directly, and enforce via logging"
am: afb2c9e9cc -s ours
am skip reason: change_id Iaceec82d4716837158d1233400b4a44cbf67a5e8 with SHA1 8c7f0100c7 is in history

Change-Id: I3afb6208c45e434fa76ae736f05c6033d6cb4707