Merge from master

Change-Id: Ib0e2fa7922857bd60e51ed7701fe640868ad07e6
tree: ac8753db1d09abd025f6e2c005a625a311b94eab
  1. default.xml