Merge "Add more info to class initialization check"
am: d78cecab78

Change-Id: Id9fc054496b75516b26eb78fb8344c31af77ef29