Fixes failing API tests for flavors

Change-Id: I8b7080df46e3c545aaca6e4b3ab6571d58b20234
Merge "Fixes failing API tests for flavors"