Forgot to amend after addressing code review comments. Bug: 26990650 (cherry picked from commit 3cfc2e4f) Change-Id: Ic8483a50e0670cac1291385a82b7c5e4a313cd18