Merge "Fix class initialization issue" into qt-r1-dev
am: 17e4063de9

Change-Id: I7b9b3d42a6ba7b57242e4cc9b7fbe03473d0ed80