fix for apn and google sync fc

Change-Id: Ic1912d8ae0d774fc14cc752ab578ff990c241db2