Add missing moved file from 76ba33b2

Change-Id: Iadbdc7e576c40da11fbf3261f26bdbae5afe7f1b