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

* commit 'c76789d35a7ca92c0b334cc6cf4a44a0044b2a44':
  Track libcore change
  Track libcore change