# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1470071653 14400
# Node ID 73ff159923c1f05899c27238409ca398342d9ae0
# Parent  db0095c83344a03e1357da5486c054ad51d47afd# Parent  67d1599b677ba34a77523b7ddc3da9a8de143aee
merge with stable