This feature can't be landed until Stein, move it into Stein folder. Change-Id: I316e31e213c79640cc3ccc49bf35afbac9650fac