Remove merge conflict duplication of code

Change-Id: If4613f86b0a33c428a9d87b8ffef1d87c5685956
Merge topic 'use-external-data' into next

bb4a9890 Remove merge conflict duplication of code