(This is a merge of http://go/wvgerrit/15992) This also updates the canary so that it will be silent on master. Bug: 25153516 Change-Id: I11163c98230c5a521609b5556b139f4508996858
(This is a merge of http://go/wvgerrit/15992) This also updates the canary so that it will be silent on master. Bug: 25153516 Change-Id: I11163c98230c5a521609b5556b139f4508996858