Merge "Add support for updating apns when only resource changed"
am: fd5b413829

Change-Id: Iff28b0685913c758bcad5900eb95f756d3fcb372