Merge from master

Change-Id: If2ca4db261e8ebd9bd684f09bdbba3df4ebc05a0
tree: a1ea69af0ccce20fd63fc575d310584a913ffe4d
  1. default.xml