Merge branch 'for-4.18-vsprintf-pcr-removal' into for-4.18