Merge changes from topic "am-f0012b2de3214675bcd05274977794d7"

* changes:
  [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix the inconsistency of protection level" into rvc-dev am: c9fc96e7b4 am: ccb1fef85d -s ours am: 2e68486822 -s ours am: 5a463a3ee4 -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] Fix the inconsistency of protection level am: b5efdf7293 am: 3142a08ea6 -s ours am: 24dbab1a54 -s ours am: 6efbb8c655 -s ours