Merge "Ignore tag that cannot be dispatched" am: a3e306fec3

Change-Id: I840c0b3859ccc93d9b519048b331f9b386584062