Merge "Update Mainline rollback lifetime from 2 days to 14 days." into qt-dev
am: 54c7c6927c

Change-Id: I24b040f5e4a02abebe929f805fbf4e667b29e92b