Merged with r18 of android-support-v4