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

Change-Id: I9dede9d10c6600918538fda45ed74fabe021ac4d