+ Remove hard reference to rpmkey + Do not use built-in moduel for rpm-key Change-Id: Icc31bb470152029e213e159d083574278673b6a5