Multiple AOM contrib backports

(cherry picked from commit 65a32a68) (cherry picked from commit 3924a5da) (cherry picked from commit 58c8b6ab) (cherry picked from commit 01d75eb6) (cherry picked from commit ab8f0e57) (cherry picked from commit b8e5d70c) (cherry picked from commit c9a5e551) (cherry picked from commit c9a5e551) (cherry picked from commit 30b116d8)