Added changes based on review. Bug 1350337.