Merge "Fix the MD debug info to the `expand\' kernels" am: 4a82aa5
am: 8c57a75

* commit '8c57a75aad2a60b3aaf875e372c3a3f7ed82d3ef':
  Fix the MD debug info to the `expand' kernels

Change-Id: I32bfb70fc1f0c231f95b7db060ebe3bc889f2274