am dd597323: am 6954f1cd: am 8fab38c2: am ce607358: Merge "Remove symbols shifted layout related code"
* commit 'dd597323cf0c8974bcf14b0164526e39953270e2':main
commit
38dfcabc43
* commit 'dd597323cf0c8974bcf14b0164526e39953270e2':main