am bd68d901: am 79d00f42: Merge "fix ImageLoader.getCacheKey()"

* commit 'bd68d901bec2cb497d27ee0502ab9b4cee1fab7a':
  fix ImageLoader.getCacheKey()