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

Change-Id: I1de9b31ffec8e3e02479d9c494c8651e881ce2a9