Merge "Index database before getting Uri Descendants" into pi-dev
am: a7fd137e2d

Change-Id: I88d50fd6157b9a62209e0afa1e6a791974a3c38b