Merge mozilla-central to autoland CLOSED TREE