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

Change-Id: Id49795d2fef415bbf264aa2690c05a5d64109c34