# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1533133437 14400
# Node ID 813e726e5343689d4f94e3deecf2d68bfc22dc7c
# Parent  faea9b1980d9b0c97f3e457b5f271248fcd63716# Parent  cc8657f6fd3ed222cc92c6994ab3a561da5ad3d3
merge with stable