Merge "DO NOT MERGE. Fix builds when fullsdk is missing." into nyc-support-25.2-dev
am: 4c17b4680b  -s ours

Change-Id: Ie3f7426ac820a3c8e931b6169338445fff7b7cb8