revert gallery to CM

Change-Id: Ia116b7cf2c5ae3029b5a6238a0c24f765308193b