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

Change-Id: I9275b39d03a8157d71c41bec0e6b7f0e3b58b24f