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

Change-Id: I0aa423de52c09f61c7a86567f08661f9b7e685b4