remerge z4u-storage to board-msm7627a-storage
Merge commit '2553e60ac9d1b622d9e1a02392e4afbe05649049' into jelly_3.4