and clean up the code a little bit while at it. Test: builds, atest Bug: 155297277 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I01a10e36f852cde1b93a91f95b51294a434885ab