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

Change-Id: I030c7905cd6aac5a24429b1c719ce8b8507a8a8c