Merge "Remove creation time checks." am: 0184f1836d am: 58a95666eb

Change-Id: I5a10c53a8357d6e0fdc5e4c282650ac642401b76