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

Change-Id: Ic16fd70eec81df0717bd9451e16be274f6de4b41