Merge from master

Change-Id: I985699416e73ec7bb24b60d46b5c52a06ab385ca
tree: 1d38ca438a30a7251d88b56c19849dc76d812156
  1. default.xml