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

Change-Id: I3306e0fd1a7fdf211e330c0a53787f9b1eb5ef1c