Add more picks

Change-Id: I0df866997a145d47e146e3d253425a178796fbad