Merge "Add logging to KeyCharacteristicsBasicallyValid"