Merge "Suppress IllegalArgumentException on API 28 or before"