CBLT-82:  begin adapting to build environment

Change-Id: I23bc4068cc7b78c30e64e1aa4c675d930f0329ce