This patch addresses a few post-submit comment for commits f562ac34a51dc and 60c9f63b66921. Bug: 34901696 Bug: 62179647 Test: runtest frameworks-net Merged-In: I4abec57e0c6bc869dc57b5eb54582dd977b64c30 (cherry picked from commit 175b574e27daa0d8832b8cc9615a15fce998309a) Change-Id: Ied9d0cec98685e5a91ed2ca2c81ad88d7ae8d751