This reverts commit 5487468d. Reason for revert: F/C fixed by ag/24907522 Change-Id: I7bb1857fbcc60d2ab21bdffca6e5a74dc6a48f25