Merge "Improved the debug message"
am: cacfab6728

Change-Id: I9e1d7a153d4a5a1e1f04e0ae04b09f5eafca6768