Fix getItemId()

 Bug: 6446119

Change-Id: If8c13c9f2cb9b93c6f3575f12111059aeeacd5cb
3 files changed