Merge 2d0bdfe4ebe2bc04b09804dedd895389c5951876 on remote branch

Change-Id: I8292751b321891ed237b2a19695745cec493a16a
tree: 9651878b3ee5ddb5d86a7fba3b72e906c6d89939
  1. config/
  2. drivers/
  3. include/
  4. Makefile