cosmetic clean-up

Change-Id: I8a156e66bc1b0f87129dcd85d3cc98fda3ba85aa
add more log messages

Change-Id: Idd3d876a658ac38aa6b32a624dada6b57b021002