Merge "Extend tune workaround time." into pi-dev
am: 97d70b63fd

Change-Id: I1197afa7f4dc38debe2112d7c26fc4bafb98f86e