Merge c047bdc65f3ecc340abd6c93e2402f7e95de17f3 on remote branch

Change-Id: If9010f944c2fc580db9d270b734d0dda6f9993c2
tree: fb40aca729fc427f2b2be23518a71393c8368540
  1. fw/
  2. hw/