Merge "Use unique temporary filename for keystore blob." am: f20aeb46c3
am: 338b878a29

Change-Id: Ib42d0f94d9f2c0bed610e48249ad33e1ad054647