Merge "Fix access modifiers on ImageView overrides" into ics-mr1