Merge "Add action bar to display the option menu items" am: 255c972b61
am: 0c135c812f

Change-Id: Id700c319b7974801f486340cf02b6454b7b47e0e