Merge "Skip unknown mime types instead of failing" into pi-dev am: 5ee81f2c4f
am: 8337e72c78

Change-Id: I20ffd86d46abcd1b5ff759848c3011a415437e15