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

Change-Id: I1b971a8542c7c392631586cd5d8f8d183d5d03cf