This is a follow up to address a few nits in change Ib5b50a3889ab15d5aac992f92e9be372a915eeff. Change-Id: I08ce4a9f5bb33761d8c5ff82ef9faf874ac97fcc