Address the review comments from bug 1061009

--HG--
extra : rebase_source : 63d565637b64a0f1ebdd6bfb8f0b0ed0ab651157