no bug - fix b2g bustage

--HG--
extra : amend_source : 133baf21b99de14e49ae0057352991428698e657
Merge m-c to m-i