Merge changes from topic 'sni'

* changes:
  Track libcore change
  Track libcore change