Merge changes Ifbd15bf9,I985e6861,I54860c7c into nyc-dev am: 7ad3c888
am: d52ab4f1
* commit 'd52ab4f1':
Make FirewallController::createChain use replaceUidChain.
Make firewallReplaceUidChain match the behaviour of createChain.
Don't crash the test if expecting more commands than were run.
Change-Id: Ifddcc3da7c7822125648495877a3f438ac2139af