Merge from master

Change-Id: I0cecc81f9b34cb6d965d2a8528ced3f45d931436
tree: 8b13eb8170feba4f2f79dc9d2a198f1e66631e75
  1. default.xml