Fix picking bug: 31701478

Bug: 31701478
Change-Id: I772fa50a90939271afcc618714d957a507cb75cf
1 file changed