Build 6 Test

Change-Id: I0301541d7ca12f9ca8daa88c6312a9565dabe772