Bug 951997 : Create content sandbox permission prompt test. r=amarchesini, jgriffin
Bug 953159 - Handle antenna switch state unknown error in fm. r=pzhang
Merge m-c to b2g-inbound.
Merge b2g-inbound to m-c