Merge "Add additional debug" am: 678258626a am: 8e8f0ab8aa

Original change: undetermined

Change-Id: Ie1e3237c1e3e49bba514c17bd5bd49df6cdbef0f