Removing obsolete API and fixing ArrayIndexOutOfBoundsException

Change-Id: I42c2b7352bf52b1fee6fbde23681d770860a6fce
4 files changed