Amend: update from peer review. Change-Id: I1986de99319fdecd21a94579c499266b048d382a Former-commit-id: 4057294c4f777ffb4ea3523bbaea7ed1a084cbd6