Follow up to a3d6c1411d. This avoids extra queries for messages that have a software defined value. Bug: T193271 Change-Id: I25aa0e27200a0b417721cf1fbd34a82095405b89
a3d6c1411d