Merge "Fix deadlock issue." into android12L-dev