Merge omap-mirror/p-jb-mr1-release into omap-mirror/d-jb-mr1-release