am e1b2fc5c: Merge "Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager" into lmp-mr1-dev

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