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

Change-Id: I579edc261fc3b951b7a3441eeed4e6cc05f634f3