Merge "Fix SDK build" am: 909fab2235 am: 0951aeb62b
am: 563d11e191

Change-Id: I186b72d05d4beb6b60c06912e32f4b0a77571c52