am 40ef74dd: (-s ours) am 512fd4c2: am 290b96f3: am 6f6989f3: (-s ours) am 80f2914b: am b67b1b45: am 094fd8ec: Add view cookies for action bar menus. [DO NOT MERGE]

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