Merge "Add test for getDeprecationTime and getExpirationTime" am: af3061e58e am: a884635617

Change-Id: Ib710d72c9544f3682acda924d2fba60eb379073e