Merge "Add user quota information into the IpSecService dump" am: fedd856546
am: 5bef43fb64

Change-Id: Ie9900672ab24be1687bbd605b2f6993dd8acaa49