Pull in changes from upstream

Hello @huckphin, 

Pulling in some changes from the upstream repo.

R=@huckphin