Merge "Allow FragmentActivity to hook in to Factory2 method" into lmp-mr1-ub-dev