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

Change-Id: I3e307c755a38bfea3146f05c97f12eccc6f7658c