Use tools:node="replace" instead of tools:merge="override"
am: c510d042fb

Change-Id: I60be51efa8561773100ecaf7fceb834443288537