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

Change-Id: I190271ae0a202f80326e90359f71a007531717fc