Merge "Fix the support-v4 demos to work on a platform with APIs V4 (samples part)" into ics-mr1