Add return value to indicate success

Change-Id: If1afc2dd088d18c1faa3873cb9e3684f4cfe2361