Merge from master

Change-Id: I002801f6c16424a08d3fd27bc5018397da51311e
tree: 871235be35eca16b3d45271bab81c83c136b6a0c
  1. default.xml