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

* commit 'ff8432548eb96655190486ee0f0fa08de5451e66':
  Merging the same files on top of tree.