Updated all samples with group categories.

Change-Id: I96847d1359fc9dcdb9bb2d0f30b4b95f3124d56f
30 files changed