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

Change-Id: I5c9d11a15eb86f60d91ebd3110ccc33fdefdf981