Merge "Revert "Remove comments and code about ro.boot.slot""