mozilla-b2g/gaia — pull request #17420 by dwi2 (2014-03-21 04:12:25+00:00)
Title: Bubble-merge 971498 979212

Merge bug 971498 and bug 979212 with solving some cherry-pick conflict