Warped and global motion were adopted in early April. Change-Id: Ibc619c758224f05244a1f4059e2b506405d46a01