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

Change-Id: I8b6fb95d50ce17f179e867011f9c830f162b9f87