Merge remote-tracking branch 'remotes/xtensa/tags/20180402-xtensa' into staging