Merge "Update sample app to listen to clicks on chip" into rvc-dev am: 259361a4ad am: 5660a1359f

Change-Id: I903887f7b2851dc78def0ddf53cb9f4f5ba35f29