Merge "Use sha256 of a string as seed in RapporEncoder.insecureEncoder" into pi-dev
am: 651ac4d119

Change-Id: Ie468743be5b369e49eacda9707e76e010639a7fe