Merge "Assert required kernel security options are enabled" into pi-dev