Merge from master

Change-Id: If0f6099470a5098ed32efcfecbedd5cd60523db6
tree: ad4ec94bc581f8271825405744a0aa2440a8108f
  1. default.xml