Adds debugging. Change-Id: I352dfe970c990fd210f3d1598519e321bbdd6ed5 (cherry picked from commit 2a202f0341801ffdebae19bff867e49e4d82b114)