Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev am: 58df6ab93f
am: 92d86d59c0

Change-Id: I690ebf4df8e22a57c5f7b2b5e0267a550db15945