Merge \"MAP: Remove redundant call to sendShutdownMessage to prevent crash\"
am: 0786878b88

Change-Id: Ic62f273f84ae4b6b3c4d63ae089511b19723c1e4