am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev

* commit '6dad59e146dc16a2386124a5cd3b28411c024c4f':
  Add view cookies for action bar menus. [DO NOT MERGE]