Merge "Updates to Adjustment.KEY_IMPORTANCE handling"