Merge "init: add support of multiple class names" am: 3c1568aa13 am: fd450bb95a
am: 4640918495

Change-Id: I0c0d72650196bdbf5288c07c114f57d3e43c9a87