Merge "Fix regression in I24d9b16"