Sync with updated REL1_23 branches in extensions

Bug: 67270
Change-Id: I8ea786b62d68760b37ed3232923e1f4427825fef