Merged with r19.1 of android-support-v4