am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
automerge: db864e4

* commit 'db864e4ddc788a21db6793bbcb5f559131f20736':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager