Merge from master

Change-Id: I913f2fb5c4974685f2ebf34d3aa5afb9d8f82980
tree: b0cd82110fbede84ab480ea5a9769e159ce793a2
  1. default.xml