[automerger skipped] Merge "Merge "Clarify which buttons are software buttons." into pie-cts-dev am: cb02f5210f"
am: efcd036334 -s ours
am skip reason: change_id I3e97b3f76a3ea0a7a923a5ad69960c8c1c028b74 with SHA1 7bb4512904 is in history

Change-Id: Id5541136cc65aac60f93c38a4319e610aa7f7a8f