am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"

* commit '1fd235cbb5975e117909c73e5e3a579ae4c28dce':