Merge "Add additional debug" am: 678258626a

Original change: undetermined

Change-Id: I1c12d52dacf2282ff07edbf90cc0333f752008e2