Merge "set_active command should update current slot information." am: cd72cbb5d8 am: e69d00e80c
am: 6b0f54a3bd

Change-Id: I7aba7a2d71e65b9b8a378c5624e220f66e1a76e7