Merge "Shorten the log in the netpolicy dump." am: 8c3e12a904 am: b10edc74ae
am: 248b91598e  -s ours

Change-Id: If4b6bf9dbae2f3d517597184bc84a67e6747a700