Merge commit 'f1879fdbfcfabd76c7674171d01a03dd09e96e62' into HEAD

Change-Id: I51bf710f2f6cc2cf09c1c52053f85eaf0b6c3f3e
tree: 923b7d9a20d88d4561e1ee94132d4e049e9b5b70
  1. fw/
  2. hw/