Merge "Merging the same files on top of tree." into honeycomb