Merge "msm: board-9615: Create a separate board file for storage devices" into msm-3.0