Merge "Gallery2: Fix CollectionIncompatibleType"
am: 7115c7cbf9

Change-Id: I2acf35452fea9973718f971af76dd0964f84423f