am 5cba1b7d: am 339f5a6d: am 67584f49: am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."

* commit '5cba1b7dcad5909a72e940bc15a1480327d104fb':