Merge 9450e3843a13239228034a648c7d70e8f002b8a1 on remote branch

Change-Id: I8f0b09d1184458dc968cb80e497842de926a77cd
tree: af3483b26a111fd70ce434d01be628efd8423463
  1. fw/
  2. hw/