Merge from master

Change-Id: I6345a9ea12d631334ae797bfd137552984f965c4
tree: a22ea58f1ff72185bc25f5bc72444b40b98c5458
  1. default.xml