Merge "Shorten the log in the netpolicy dump." am: 8c3e12a9 am: b10edc74 am: 248b9159 -s ours am: 5f5c4fd0 -s ours Change-Id: Ib99ddd48f0c84eda0e95e8d38f3dfe9ebf8c4e55