Fix compile errors caused by MethodNotAllowedException

Change-Id: I18ae7b5c13a10f13bfce6afbe3094280f6c5c386
10 files changed