Merge proposals dependent on lp://qastaging/~zhangew401/yelp-scope/bug-fixes

lp://qastaging/~zhangew401/yelp-scope/bug-fixes has no merge proposals.