Adapt to Account.Id refactoring

Change-Id: I74ab4041866925a239e91ebae6347ecf97b9926b
1 file changed