Merge "Merge "Remove usages of ActionBarActivity." into oc-dev am: 06600152 am: e889dc0e" into oc-dr1-dev-plus-aosp