Merge "Making software km implementation both backup and default" am: 67be8d72bf am: 803b6971a7 am: 81ff06ea77

Change-Id: I702b1742f8a970b8f1a779b87534e150315f3e89