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

Change-Id: I581fb4fe0aa7dca4637c176254eb1c19719558c4