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

Change-Id: Id0dde389a42cf51d3bbabcd5476058f0acff44ad