Merge "Fix recursive initialization on app image."
am: fc1cd86539

Change-Id: If5b9333799280749360399dc83f009c37a3a0569