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

Change-Id: I6026f590b0de42482bdcb7bbe36247410f8a094d