Adding orphaned file from previous patch

Change-Id: I0ed17a6c241fcfb19e33408bbf9aeacd079458dc
Merge "Adding orphaned file from previous patch"