Merge "Merge "Don\'t save a rule without a name." into nyc-dev am: 257355af...
Merge "Merge "Don\'t save a rule without a name." into nyc-dev am: 257355af am: 8db5a131" into nyc-mr1-dev-plus-aosp
am: e676f186
* commit 'e676f186':
Change-Id: I6f92a1c8be1779602e71083b62308aca8d8a4905