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

Change-Id: Ib11f2cc51a2a262642911f2fff6da65f25c6fa63