Merge "Add additional debug" am: 678258626a

Original change: undetermined

Change-Id: Iff980032abe6e7a55e981f4a904c11ae430c5e11