Simplify a little bit of logic in a few places

Change-Id: If52a8e6e648737c52f75173946a1f4cbe7e12e5a
Simplify error output a tad in updateOneSearchIndexConfig

Change-Id: I0a9dbbca5bcfbe9db7736e8ad1172f7a14a29a55
Merge "Simplify a little bit of logic in a few places"
Merge "Simplify error output a tad in updateOneSearchIndexConfig"