Merge remote-tracking branch 'github/main' into revert_merge_2_pandora_snippet

Change-Id: I39062785238d021a2c7e6cc6f28beb603ab72e63