Merge "cluster-logging: Disable build in PDK" am: d4a8badc9b
am: 7c87ec217d

Change-Id: I9db1dbe88b3cc8c99e6ec7f8de0098065422c90c