Merge "Refactor FakeIcing to use the real Icing lib's protos."