Merge from master

Change-Id: I2d7a11eee4a41d12a4927640840c5c45e5421988
tree: 3ee827b5fb5e100b58149cdbd05c3f6c7282a2f8
  1. default.xml