Merge from master

Change-Id: I89eab219489eb53f72ec16edf9a2d514963e7070
tree: 4c1e2fd8ba22a779a54a08cbd7d7d75aab85e2aa
  1. default.xml