Merge "Remove usages of ActionBarActivity." into oc-dev am: c742b8ab2d
am: 964993e9aa

Change-Id: I6f6e5c06b274d55f47483fd4d7bf20d50c08741b