Merge "Reland "Remove comments and code about ro.boot.slot"" am: dea5e081ac
am: 9bc2a967cf

Change-Id: I004d8761fca5c0d1b8b6f4e8546fc2ecf2f1f34c