Merge changes from topic \'sni\' am: c76789d35a
am: a849f1e430

* commit 'a849f1e4309e7624bdb3da7b443907cfd829a82e':
  Track libcore change
  Track libcore change