Merge "testtimeinstate: missing license header" am: 54dea14617 am: cc3f293bed am: 938aa44a62

Change-Id: If7dc2ab64ed5bc0b1354d10594501e179a0ed67f