am f101fd7d: am 289d819c: am 30d26326: Add directory photo support

* commit 'f101fd7d198036b7e9f9015c93cbf005d0771ccb':