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

Change-Id: I7dcd2edd9978577842838513c1e1c4880bb5b3f8