improvements based on discussions with Sean Webb Change-Id: I5726a4c43b2b860f9fbc9e173cca5907d0a69c74 Former-commit-id: c57b4988b97327c1efa52383644913319eb0df74
Former-commit-id: 919f4ca671ca953b881037e4a69d720d3bf79eb5