am 3f74f0cb: Merge "Fixing some issues with AppsCustomize" into ics-mr0

* commit '3f74f0cbc63a1ee264b49d5ca88954ea294b366b':
  Fixing some issues with AppsCustomize