Merge "Manifest merge for ADT."