Merge remote-tracking branch 'remotes/upstream/b2g18_v1_0_1' into b2g18_v1_0_1