Updated for SDK builds

Change-Id: I411e7bf072a3d829994233c267e60586f5499b11