Merge "Phan: resolve and reenable PhanAccessMethodProtected"