This is necessary for OSX where we are using a core context that does not implement any legacy features anymore. Change-Id: I59536e99761691d910fef62cf82ceb03e57725ae
Change-Id: I7a3680aa324c4242572b71c91ec5bc4f85eff9e9
Change-Id: I7b1ca054006500d468da73d2d85eafaad85dda67