Merge "fix duplicit test spec, add bionic as upcomming platform"