Updated for SDK builds

Change-Id: If4f5d039afb6aebd15564acfe28228c93aa0314b