Merge "Remove references to sample application" into ics-mr0