Merge "DO NOT MERGE ANYWHERE Add comments and code about ro.boot.slot back" am: 6b07ee9fb5  -s ours am: 6cdd5f9002  -s ours
am: bee3639ab1  -s ours

Change-Id: I0a4d2adc07ab62c6bdffaea2f709e9ff0b62de27