Merge "API 29: Clean up unintentionally published checkNotUsed / markUsed"