Merge remote-tracking branch 'omap-mirror/d-lollipop-mr1-release' into d-marshmallow-release