Merge "ActionMode fixes found in testing" into nyc-dev
am: 409da25

* commit '409da253169779e8258b52d3a5f0c8c37f6217d6':
  ActionMode fixes found in testing

Change-Id: I3a63b0095b5f3f9a8ef23b3daec9bcd2dadd1558