Merge from master

Change-Id: I56afc6c9637ed88b1d35b50e94ad16e4a571b7de
tree: b9f959b5ce8422aa90fd51202773f64d6852967d
  1. default.xml