Merge changes I2bcbe6fa,I302b77bb am: 233c77b06d am: c75a928ae1

Original change: https://android-review.googlesource.com/c/platform/external/linux-kselftest/+/1423571

Change-Id: I747634ee24d1ad40a0c582a7b7a8ebe493ae1b39