25fb1ce9c5
This patch addresses comments for change Ia3e6b6072fdf7a4bfffdc3fbaf31103605c7ff5b and updates one logging message. Change-Id: I6a52846aa6ce6d69301351de294a2e9db697df6c