Ignore bad profiles when --force-merge is specified am: e571a283b7
am: f895d790b8

Change-Id: I3c4b6d2fc854be508f5ccfb91a1c81c1bec5817b