optimizations to loading oontz oontz

Change-Id: I52ca8851736a182fc3f8acdefd9075b43f22c9f6
Merge "optimizations to loading oontz oontz" into jb42