Merge "Fix and suppress API lint warning"