Merge from master

Change-Id: I01b9db3643d3eca22f1c7bd6ef35422ad9872273
tree: 032785eb1e39019c667950bcc6734415c798dfea
  1. default.xml