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