Merge "Add action bar to display the option menu items" am: 255c972b61 am: 0c135c812f
am: 3415e18361  -s ours

Change-Id: I9f9c376d1dba614462ce829e00fb29d4bc81d7ec