Merge "Merge "Catch rule creation exceptions." into nyc-dev am: f1c2e62f4e am: 35dc1899a6" into nyc-mr1-dev-plus-aosp
am: b7656a26dc
* commit 'b7656a26dc5528b62d6413ba3b6b7ab64266e281':
Change-Id: I4818b21b66b91352c8104938546e9fb6f39636a6
This commit is contained in: