Merge "Convert copying of .txt files to .bp"
am: 71fd29d891

Change-Id: I9ba86009c8f0d23a60ee013c84d57957bf5c1c43