Addressing previous CL comment. Bug: 151888061 Test: Compiles Change-Id: I4c740134b08bae9f40531c4a0d4133336d1a88d1