Merge "Add test for getDeprecationTime and getExpirationTime" am: af3061e5 am: a8846356 am: cf695d45 am: 0fdbddb6 Change-Id: Ibbcdd20dd3547a2bfe1b849d66e40a4bb1a362e0