Created by: dsyang
Address comments from https://github.com/facebook/buck/pull/937#discussion_r83084051