tree 96f8b56ac84defdb4c18e25eeaa42faf9b901151
parent ac1d97b3bb8233bbc8dcec4dfc6a268529acad77
author Pei He <peihe@google.com> 1475265267 -0700
committer Pei He <peihe@google.com> 1475265323 -0700

Forward port fixups in Beam PR-1032