Merge "Baseline existing API lint warnings"