Fix FCs due to merge of 4.4.3

Change-Id: Iad76db1b844e0f3a60d2f3dc1b43fe458af3bf4e
Derp

Change-Id: I8c6c7b694dc700753cc344af59d8428fc2975c13