Remove all conflicting features with PA hybrid addition

Change-Id: I5e9720ea82198627b97ff8aa680f517a1f93bf84