Add logging

Change-Id: Ie74b933685ea0f05a1f9bdb41d0feba3d1bb2605