ConsistencyChecker check and fix for missing patch set refs Change-Id: Ic485aa6e35fd0b0127362b5213e7f392312b727e