Merge "Update ic_sync_problem to GM2." into qt-r1-dev am: 0217400ea5
am: fea6983c2b

Change-Id: I20bbc5ac6a52fa9b22c67b7dc912f5c6114658c5