Merge branches 'baseline-2015-sgx' and 'baseline-2015-drm-sgx' into baseline-2015