Merge "DO NOT MERGE: Ensure zen SystemConditions are subscribed" into pi-dev
am: 6b188c070e

Change-Id: Ie33e07277cef28558f8213cee8b01a9082f46d23