Merge "Remove requirement for kiss emoji should have gender" into pi-dev
am: 228bf4f320

Change-Id: I9168be274a5ced20d8ddbf1ef6475dfec82262ef