Merge "Precise command constants on adb/protoxol.txt" am: 85a78f19b1 am: f8188895a1 am: 7bcc5bd0d0
am: cdf8fba6a1

Change-Id: Icf31a883ac7e4c5a7f45430e71a6f43b59083d6d