Merge "Fix boot classes init when compiling app image" am: 7df2bb6411
am: b1fe91a700

Change-Id: Ic352f27b8ccbe61a3f9ccdabbea8f0c3c66852ce