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

Change-Id: I5260baff36b2fbf3791174926cb062d7e823d610