Merge "Move platform 15 sdk rev to 2. do not merge." into ics-mr1