Handle dynamic loading issue

Change-Id: I6de6ec58bdafb6d60ee35a6ed12414843004d084
1 file changed