Bug 768667 - Follow up for review comments. r=sriram