Merge 30541cf2c8f94fd6938fd7aab98c4a7d3a4ca3d5 on remote branch

Change-Id: I7c4c4d627148512b6c6dd83b69fc0059f999050f
tree: 90adf7051d99b2d827aa3033beb8cc2c5ec5913b
  1. fw/
  2. hw/