Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Add explanatory comment to empty BUILD file(s)

Change-Id: I4d3df2063dac861698264820300fb62ffce46e29