Fix keystore breaking build

Change-Id: Ib551ab39df2e4a7f7a79247fcc9e81968db17ca9