merge in brillo-m7-release history after reset to brillo-m7-dev
tree: da3d72b288ffe2161eda941f76e8a1dc892d87d9
  1. default.xml