Merge commit 'b6ffc8f2535c38703e753cfc1535134b5976c4e1' * commit 'b6ffc8f2535c38703e753cfc1535134b5976c4e1': Fixed class paths in layout xml files
Merge commit 'b6ffc8f2535c38703e753cfc1535134b5976c4e1' * commit 'b6ffc8f2535c38703e753cfc1535134b5976c4e1': Fixed class paths in layout xml files