Merge "Add extra bionic repo"