Merge "Add test for getDeprecationTime and getExpirationTime" into rvc-dev am: 95d81dfe am: 792debcc Change-Id: I907ad96dab3a2b6854578aa19c38c247c32a55ac