Merge "Don\'t broadcast <Standby> message during shutdown when setting is...
Merge "Don\'t broadcast <Standby> message during shutdown when setting is disabled" into nyc-dev am: cff08461
am: 04dc28af
* commit '04dc28af':
Don't broadcast <Standby> message during shutdown when setting is disabled
Change-Id: I4be00b75b05a1764e1876051334f6ca90dd24512