Add FIXME for deprecated method

Change-Id: Ie82aea54584430767b2fd4233a76059f7d880dab
Merge "Add FIXME for deprecated method"