Merge "Check that classes are loaded before updating entrypoints." am: 62fdb114 am: 3b255db1 am: ac065633 am: be4e78f1 Change-Id: I1bde7e18502670a72b643e076f54140a5a6ca97f