CBLT-252:  there is no systemProperty in build()

Change-Id: If2241deb1b8f694e345e7d99d5649c4089477626