Merge "Merge changes from topic "punch_shared_libs" into main am: 114bff10ac am: d73ea53ce4" into main