Merge "Switch RebootType to an enum class." am: db725d3348
am: da54114d23

Change-Id: I36b78d3ece0bef5ebedc3193ba989afdfb97e777