Merge from master

Change-Id: I8b5010bff1cf2054f2737c46840342134c793862
tree: 5dda11a5cecc15ebeb9737d1674e82dce0bb4653
  1. default.xml