Merge "DO NOT MERGE ANYWHERE Add comments and code about ro.boot.slot back"