Merge "Minor corrections to the Keymaster4 documentation." into pi-dev