Amend: updates from peer review. Change-Id: Icd33c9175f210d864bd5117fc54c76362b76ac22 Former-commit-id: 807f278d542bc36331aa83b46a86a3af9dbb6675