Sync up with BeanStalk which brings improvements to search and other various changes.

Change-Id: Ie552f27a7d0228f0031a555296ded2139783fd38