Lower the check to class is initialized.
am: 19cb8e2bcc

Change-Id: I75ad568cc864878d145f7c274256d379084810b3