Merge changes from topic 'upgrade-expat-2.2.0' am: d61777ec98
am: 470553711f

Change-Id: Ide06dd57cdd1c30b2cfc797b69f46188180e6f26