Merge "Clarify which buttons are software buttons." into pie-cts-dev
am: cb02f5210f

Change-Id: Id2a67350f8a7b496e99c7a48170a686d2475a903