Merge pull request #7012 from stangri/master-luci-proto-nebula