Merge "Shorten the log in the netpolicy dump." am: 8c3e12a904
am: b10edc74ae

Change-Id: I3d32614df1f9ba3217dfbc6fcfe555db28dccb69