Merge "Check that classes are loaded before updating entrypoints."
am: 62fdb114ce

Change-Id: I857efef86a0fbf35c03eb5568f1b0f461b0be665