Python 2 has been deprecated. This patch removes all unicode strings. Change-Id: Ie323d459923b36de544c15c45d61eb89866fc550