Merge "Fix exit-time-destructor warning"
am: ae74e42d25

Change-Id: Iaba5af629a1eeaf2e5d7abe5f94662119adea424