Merge "Making software km implementation both backup and default" am: 67be8d72bf

Change-Id: Ie1a107c4904e8bcd507ec5d25cb61f98fe09f0b5