Fix samples metadata concat. am: 8d565ed204 am: bafc0b1baf am: 20e91f4e7a
am: 3dc35a0148

Change-Id: I1dcbc4eadda8cf03bbad1c4278efdd6dad0c6eaf