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

Change-Id: I56a3eccb90b23ec941ef5584741aef05ee279137