Merge "Include command-line arguments in comment." am: f7bf9abb58 am: 8b34a8a348 am: 727f16f7bf am: 7d219b885d am: 21110ba90a

Original change: https://android-review.googlesource.com/c/platform/development/+/1327013

Change-Id: I05989d4f245668f5f2bd54a7a86e1ad12f20e243