Merge commit 'da32be5e06b9f02d0113b072de79276e16d19f50' * commit 'da32be5e06b9f02d0113b072de79276e16d19f50': Removing references to deprecated API and the deprecated API itself.
Merge commit 'da32be5e06b9f02d0113b072de79276e16d19f50' * commit 'da32be5e06b9f02d0113b072de79276e16d19f50': Removing references to deprecated API and the deprecated API itself.