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

Change-Id: I2212049ea3fdf80b90f7418282248194b1d08eb9