Merge branch 'master' into brillo-m8-dev

BUG=26182029
tree: d0c5c598f9bd75af69bb92eddb1e1902f60efc9e
  1. default.xml