am d96c6956: am 0f33e44f: am 0987ff87: Merge "Add Flo to device art generator." into jb-mr2-dev

* commit 'd96c6956807ca1644079a9e92d0e3af170c51c8f':
  Add Flo to device art generator.