Merge "testtimeinstate: missing license header"
am: 54dea14617

Change-Id: If71473ff15bf9582afca5f1a685b6c9e6a645061