Merge branch 'emu-master-dev' into emu-master-qemu

Change-Id: Ifc58e69edc93c75b93c95e9ae775be9bb2b72e3d
tree: 046a8e39b09416536d34c16cdedce7c6debb70dd
  1. default.xml