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

Change-Id: Ia859d1817eb80a34f339fe99894bffa4163440ce