Merge cherrypicks of [2364823, 2364731] into nyc-mr2-release

Change-Id: I071d4cdb59b3a54bfb57c868a8b47592e3648f31
tree: 6ea1fa6a0a33091d2056c90a02b128a3a0a2fae6
  1. bcmdhd/
  2. .gitignore
  3. CleanSpec.mk