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

Change-Id: I06ed6fea1fe414e7a33694047b0e6e903b7816bb