Fix samples metadata concat. am: 8d565ed204
am: bafc0b1baf

Change-Id: I21dadb32eeb771aae9c188372d0da1cf4ea16126