Merge "Clean /bionic"