Merge "Export init.svc.console as an actionable property" am: 9f5e6dbe85
am: 8a5e67befe

Change-Id: Id63096e0f8472cf2b6519a026d65ab668d2fd479