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

Change-Id: I30c1df50004c1297cf39e8e5dca65a9a8fce74d5