am 71282a47: Merge "Fix access modifiers on ImageView overrides" into ics-mr1

* commit '71282a476ad57ec398f0a8d33cf67bfd469c8c55':
  Fix access modifiers on ImageView overrides