Merge remote-tracking branch 'AOSP/lollipop-release' into lollipop-ras-mr1