Reviewer comments. Change-Id: I4704a93fab83b88041eb942c9a163a6f117a70ea Former-commit-id: e6ad4922c4bc950fcf9cb184707b3e757373e851