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

Change-Id: Ib99ddd48f0c84eda0e95e8d38f3dfe9ebf8c4e55