Small refactoring to make the next diff smaller

Step 7

Bug: 5306641
Change-Id: If5454679252a54670c501d3a63e9e4bd45028c44
1 file changed