Amend: Peer review comments Change-Id: Id200527b4f901134bf79f60a9137ffda484b8d21 Former-commit-id: 120bd1f8278c78878bb499ec6b08932174dae1a6