Merge "Add separator to auto zen rule listing." into oc-dr1-dev
am: afe4ce0927

Change-Id: I91c22aeb773e32d544bb658a61e94c2b740ae5c9