Imported Upstream version 2.2.9

Change-Id: Idd1555b43e096cfc4f9bd6e0d645665e7111b94e