am 55cadb05: Changes to handle restrictions API change

* commit '55cadb05ded9ddc54e70c6be4fef019b3e8c8439':
  Changes to handle restrictions API change