Merge commit '00cb6417' into master.  Doesn't turn on the debugging.

Change-Id: I1d4db9c5256ba45a44e50e8229b895e2e5330690