Merge "Add comment with packet tracker debugging tip" am: 40aa5ee583
am: 17dd8723b7

Change-Id: I1d937d99d58ae031d6bf86f3407669bf47d5c037