smw.Query conditions can be either an array or an object

Change-Id: I1b1ec8ff9dc03bda1da3afefc6f2672fc1e5f563
Merge "smw.Query conditions can be either an array or an object"