Fix build number search

Change-Id: I9f497468ac4278735cc75c0d335855ba8212f611