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

Change-Id: I88d6399c7696fddcaedac6e927280a36022dacac