am 7ed74d2c: am 96df62ef: am 4168dc49: am 97436804: am 540efef7: Merge changes Ida9603e3,I3dfa45cc into jb-ub-now-jolly-elf

* commit '7ed74d2cc2deb59e32d72a0950e7beb179d73d46':