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

Change-Id: Ibf2f370c97a602f186e37ea9ffbe177dd2ee0f1c