Merge "Add initial tests for EMBMS file-download" am: 03dfc53792
am: 36d24cf583

Change-Id: I828e73dcc0668f6057a356ea881e1b67059c15df