Merge commit '4d7ddab160ba29247225e11c2092dcfd68bd6baf' into ics-factoryrom