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

Change-Id: Ie10c1ddf16fa238b2e2ee5b0c58b1cff3981433f