Merge d5a1751a4f5bf39273059259506b618bedf5ee12 on remote branch

Change-Id: Ib83f3b6f6b4c93a67f82cb5e12cdcb68315e03d2
tree: e7be6d0c8abfb04fb59f0db583a16e6f9368dae5
  1. fw/
  2. hw/