8.5/ Follow up to comments from previous CLs

Bug: 141886704
Change-Id: Ib583753e35e57eab3b1cc413a0f910cf10142e42
5 files changed