Adding 20 secs

Change-Id: I6acb95df047e2817b79bbab49b8f433feb4a7fa2
Merge branch 'cloudkeep_working_dev' into cloudkeep_jenkins