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