Merge "Remove patch for bionic"