Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: Make loggers private Change-Id: I2ebbad6da3509e2d62e8fb48ebba6d0a2caf4b7f