Merge "Revert "Making software km implementation both backup and default"" am: 24dce34ad5 am: 4f0fd48c01

Change-Id: Ibf9b3f005e55400ac2c2a1f02e499950438a53df