Merge branch 'mac-fixes' into 4.14.98

Change-Id: I50b6e00a5cc5dd9e054d9cccc27525cb5942b145
tree: bd32e666551e2bc4582a98815c192e77a2c9e614
  1. debian/