Amend: Code review cleanup Change-Id: I7d255531ba051c2ede2169af31b08f2c7a9cfcdd Former-commit-id: 107506fb635030f91d1d79e4e755864e28a04fed
Former-commit-id: 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1