Merge commit 'e6ae5c39848d2a3a6f3fb750811550969799e410' into gingerbread-plus-aosp * commit 'e6ae5c39848d2a3a6f3fb750811550969799e410': Add shutdown assurance
Merge commit 'e6ae5c39848d2a3a6f3fb750811550969799e410' into gingerbread-plus-aosp * commit 'e6ae5c39848d2a3a6f3fb750811550969799e410': Add shutdown assurance