Change-Id: Ie410edc7433de45b895a0fe9940e70513df15caa
Change bionic test from dev to gate for 18.05. Change-Id: I4d82f73b7b83d5bb597147663d424554d34d7e76
Change-Id: I4f96a84b8dc7f447ac1b0b89a2a494be8e4946ad