https://android-review.googlesource.com/c/platform/frameworks/support/+/2690433 (cherry picked from commit ea15bc782a2cd603c78de7567a59e973dd50fd7f)
https://android-review.googlesource.com/c/platform/frameworks/support/+/2690433 (cherry picked from commit ea15bc782a2cd603c78de7567a59e973dd50fd7f)