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

Change-Id: I19932e3111b573ec45d7a36e145bbdb804f043b5