Fix API as per the upcoming 9.1 release

Change-Id: I307f8f3239178415a66f0bed0b63e5b0d7ffe4cd
17 files changed